150990a30c70cded8f9668f92ce89a604a4328f6,plugins/org.eclipse.emf.compare.ide.ui.tests.framework/src/org/eclipse/emf/compare/ide/ui/tests/framework/AbstractCompareStatement.java,AbstractCompareStatement,setConflictPreference,#,294

Before Change



		defaultConflictDetector = emfComparePreferences.get(EMFComparePreferences.CONFLICTS_DETECTOR,
				defaultConflictDetector);
		emfComparePreferences.put(EMFComparePreferences.CONFLICTS_DETECTOR, conflictDetectorId);
	}

	/**

After Change


				}
			}
		}
		if (conflictDetectorId != null) {
			rcpPreferenceStore.setValue(EMFComparePreferences.CONFLICTS_DETECTOR, conflictDetectorId);
		}
	}